More thoroughly hide clearly broken code that should exist only on a branch

that seeped into master when I added an epmpty file.

diff --git a/yahoo.cc b/yahoo.cc
index 780fdd909f8a34dedc04180699a1197633a777e3..72d312621fea4a6d65c5c9e9d5c4790bafaf5629 100644 (file)
--- a/yahoo.cc
+++ b/yahoo.cc
@@ -48,7 +48,8 @@ static xg_tag_mapping gl_map[] = {
 void
 YahooFormat::rd_init(const QString& fname)
 {
-  xml_init(fname, gl_map, nullptr);
+abort();
+//  xml_init(fname, gl_map, nullptr);
 }
 
 void

diff --git a/yahoo.h b/yahoo.h
index 63f0189c59e5082c0875552bb0f835a24d3c5bd2..1dc7fead0e3e6928470de0d4e3c0e4b0c805307a 100644 (file)
--- a/yahoo.h
+++ b/yahoo.h
@@ -43,8 +43,11 @@ public:
   }
 
   QVector<ff_cap> get_cap() const override {
-    return FF_CAP_RW_ALL;
-    //return { (ff_cap) ff_cap_read };
+    return {
+      ff_cap_read,  // waypoints
+      ff_cap_none,  // tracks
+      ff_cap_none   // routes
+    };
   }
 
   QString get_encode() const override {
@@ -76,23 +79,7 @@ private:
  void wpt_lat(const QString &, const QXmlStreamAttributes *);
  void wpt_lon(const QString &, const QXmlStreamAttributes *);
  void wpt_addr(const QString &, const QXmlStreamAttributes *);
- xg_tag_mapping gl_map[];
-
-#if 0
-      static xg_tag_mapping gl_map[] = {
-      { wpt_s, cb_start, "/ResultSet/Result" },
-      { wpt_lat,       cb_cdata, "/ResultSet/Result/Latitude" },
-      { wpt_lon,       cb_cdata, "/ResultSet/Result/Longitude" },
-      { wpt_addr,      cb_cdata, "/ResultSet/Result/Address" },
-      { wpt_addr,      cb_cdata, "/ResultSet/Result/City" },
-      { wpt_addr,      cb_cdata, "/ResultSet/Result/State" },
-      { wpt_addr,      cb_cdata, "/ResultSet/Result/Zip" },
-      { wpt_addr,      cb_cdata, "/ResultSet/Result/Country" },
-      { wpt_e, cb_end,   "/ResultSet/Result" },
-      { nullptr,       (xg_cb_type)0,         nullptr}
-      };
-#endif
-
+// xg_tag_mapping gl_map[];
 
 };